From 16c6db8c5956dd46d52f7b3eeb0f4435d0f8f884 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Fri, 26 Nov 2010 12:35:42 -0600 Subject: [PATCH] Build-depend on "bsd-mailx | mailx" rather than just "mailx". --- debian/changelog | 9 +++++++++ debian/control | 2 +- debian/control.in | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 92d3869a141..e80f2debba6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +emacs23 (23.2+1-6) unstable; urgency=low + + * Build-depend on "bsd-mailx | mailx" rather than just "mailx" since + the latter is a virtual package. Thanks to Cyril Brulebois + for the report, and thanks to Mehdi Dogguy + for the 23.2+1-5.1 NMU. (closes: #600826) + + -- Rob Browning Fri, 26 Nov 2010 11:34:32 -0600 + emacs23 (23.2+1-5) unstable; urgency=low * Apply upstream patches to prevent the string and unibyte-string diff --git a/debian/control b/debian/control index 05da4b837ff..c5e16fb5eff 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: emacs23 Section: editors Priority: optional Maintainer: Rob Browning -Build-Depends: mailx, libncurses5-dev, texinfo, liblockfile-dev, librsvg2-dev, +Build-Depends: bsd-mailx | mailx, libncurses5-dev, texinfo, liblockfile-dev, librsvg2-dev, libgif-dev | libungif4-dev, libtiff4-dev | libtiff-dev, xaw3dg-dev, libpng12-dev, libjpeg62-dev, libm17n-dev, libotf-dev, libgpm-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libdbus-1-dev, diff --git a/debian/control.in b/debian/control.in index 21ea9f9e8de..21dd6aaaf84 100644 --- a/debian/control.in +++ b/debian/control.in @@ -2,7 +2,7 @@ Source: @DEB_FLAVOR@ Section: editors Priority: optional Maintainer: Rob Browning -Build-Depends: mailx, libncurses5-dev, texinfo, liblockfile-dev, librsvg2-dev, +Build-Depends: bsd-mailx | mailx, libncurses5-dev, texinfo, liblockfile-dev, librsvg2-dev, libgif-dev | libungif4-dev, libtiff4-dev | libtiff-dev, xaw3dg-dev, libpng12-dev, libjpeg62-dev, libm17n-dev, libotf-dev, libgpm-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libdbus-1-dev, -- 2.30.2